From b94a8883ac5472f659b8c5da1635e0cbcf305ee1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 9 Aug 2004 15:09:10 +0000 Subject: [PATCH] Add gtk_entry_layout_index_to_text_index() and its inverse. The have Mon Aug 9 10:50:05 2004 Matthias Clasen * gtk/gtkentry.h: Add gtk_entry_layout_index_to_text_index() and its inverse. The have always been exported and are meant to be public. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ docs/reference/ChangeLog | 5 +++++ docs/reference/gtk/gtk-sections.txt | 2 ++ gtk/gtkentry.h | 10 +++++++++- 7 files changed, 40 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 07020d1aff..075aabaf20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Aug 9 10:50:05 2004 Matthias Clasen + + * gtk/gtkentry.h: Add gtk_entry_layout_index_to_text_index() + and its inverse. The have always been exported and are meant + to be public. + Mon Aug 9 00:28:34 2004 Matthias Clasen * gtk/gtkicontheme.c (load_svg_at_size): Don't leak the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 07020d1aff..075aabaf20 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Aug 9 10:50:05 2004 Matthias Clasen + + * gtk/gtkentry.h: Add gtk_entry_layout_index_to_text_index() + and its inverse. The have always been exported and are meant + to be public. + Mon Aug 9 00:28:34 2004 Matthias Clasen * gtk/gtkicontheme.c (load_svg_at_size): Don't leak the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 07020d1aff..075aabaf20 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Aug 9 10:50:05 2004 Matthias Clasen + + * gtk/gtkentry.h: Add gtk_entry_layout_index_to_text_index() + and its inverse. The have always been exported and are meant + to be public. + Mon Aug 9 00:28:34 2004 Matthias Clasen * gtk/gtkicontheme.c (load_svg_at_size): Don't leak the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 07020d1aff..075aabaf20 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Aug 9 10:50:05 2004 Matthias Clasen + + * gtk/gtkentry.h: Add gtk_entry_layout_index_to_text_index() + and its inverse. The have always been exported and are meant + to be public. + Mon Aug 9 00:28:34 2004 Matthias Clasen * gtk/gtkicontheme.c (load_svg_at_size): Don't leak the diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index be92859db4..b3ea8e0f32 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 9 10:52:23 2004 Matthias Clasen + + * gtk/gtk-sections.txt: Add gtk_entry_layout_index_to_text_index() + and its inverse. + 2004-08-07 Matthias Clasen * gtk/tmpl/gtkrc.sgml: Fix a typo (#164470, Mariano diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 5e3ba347e2..bea8f5312d 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -1064,6 +1064,8 @@ gtk_entry_set_alignment gtk_entry_get_alignment gtk_entry_get_layout gtk_entry_get_layout_offsets +gtk_entry_layout_index_to_text_index +gtk_entry_text_index_to_layout_index gtk_entry_get_max_length gtk_entry_get_visibility gtk_entry_set_completion diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index b34ed47748..751e177ccc 100644 --- a/gtk/gtkentry.h +++ b/gtk/gtkentry.h @@ -174,7 +174,7 @@ gint gtk_entry_get_width_chars (GtkEntry *entry); /* Somewhat more convenient than the GtkEditable generic functions */ -void gtk_entry_set_text (GtkEntry *entry, +void gtk_entry_set_text (GtkEntry *entry, const gchar *text); /* returns a reference to the text */ G_CONST_RETURN gchar* gtk_entry_get_text (GtkEntry *entry); @@ -191,6 +191,14 @@ void gtk_entry_set_completion (GtkEntry *entry, GtkEntryCompletion *completion); GtkEntryCompletion *gtk_entry_get_completion (GtkEntry *entry); +PangoLayout* gtk_entry_get_layout (GtkEntry *entry); + +gint gtk_entry_layout_index_to_text_index (GtkEntry *entry, + gint layout_index); +gint gtk_entry_text_index_to_layout_index (GtkEntry *entry, + gint text_index); + + /* Deprecated compatibility functions */ -- 2.30.2